Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Merge pull request #2305 from leelavg/5072-onboard" #2314

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Revert "Merge pull request #2305 from leelavg/5072-onboard" #2314

merged 1 commit into from
Dec 20, 2023

Conversation

leelavg
Copy link
Contributor

@leelavg leelavg commented Dec 11, 2023

This reverts commit 19293d0, reversing changes made to df7a769.

ref: #2305 (comment)

@leelavg leelavg force-pushed the revert-5072-onboard branch from 64d4ec9 to 3d54ae3 Compare December 11, 2023 02:52
@leelavg leelavg requested review from nb-ohad and removed request for nb-ohad December 11, 2023 06:22
@leelavg
Copy link
Contributor Author

leelavg commented Dec 12, 2023

will wait for #2308

@leelavg leelavg closed this Dec 12, 2023
@leelavg
Copy link
Contributor Author

leelavg commented Dec 20, 2023

@umangachapagain @iamniting this PR was originally merged into main w/ partial reviews and from then it's hindering me to resolve conflicts as I had to raise a PR w/ 2 commits, w/ a revert and feature.

eventually this code needs to be pulled by client-operator as well and that's creating a couple more issues.

Ask:

  • can this revert PR be merged to main so that client-operator can pull the main successfully w/o any changes to provider api
  • then I'll be able to rebase on main w/o any conflicts, I already tried a couple of ways but those coming out to be either ugly workaround or straightway bad

On me:

  • after merge to main, I'll get the changes to 4.15 as well via usual bug process

thanks

@leelavg leelavg reopened this Dec 20, 2023
@leelavg leelavg force-pushed the revert-5072-onboard branch from 3d54ae3 to f57daeb Compare December 20, 2023 05:47
@leelavg
Copy link
Contributor Author

leelavg commented Dec 20, 2023

/retest-required

@leelavg leelavg requested a review from nb-ohad December 20, 2023 07:20
@iamniting
Copy link
Member

/test ocs-operator-bundle-e2e-aws

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leelavg, nb-ohad

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 20, 2023
@leelavg
Copy link
Contributor Author

leelavg commented Dec 20, 2023

/test ocs-operator-bundle-e2e-aws

@iamniting
Copy link
Member

/override ci/prow/ocs-operator-bundle-e2e-aws

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 20, 2023

@iamniting: Overrode contexts on behalf of iamniting: ci/prow/ocs-operator-bundle-e2e-aws

In response to this:

/override ci/prow/ocs-operator-bundle-e2e-aws

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 5e04cc2 into red-hat-storage:main Dec 20, 2023
14 checks passed
@iamniting
Copy link
Member

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link

@iamniting: new pull request created: #2340

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 20, 2023
Merged
@leelavg leelavg deleted the revert-5072-onboard branch December 11, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nb-ohad nb-ohad nb-ohad approved these changes

Assignees

@nb-ohad nb-ohad

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@leelavg @iamniting @openshift-cherrypick-robot @nb-ohad